Updating and final tweaks
More tweaks