stuff and some things. All Minor

just some cleanup and minor tweaks