Cleanup

This is just some monir cleanup and adding missing shit that somehow got missed/left out of prior merges.