Finished final tweaks