Final tweaks and additions