Completed

Adjustments and joomla fixes