Final tweaks, some cleanup