Final tweaks and changes