Compr-Monday, work on cleanup and checks for all new vulns thanks to Jam...

...es and Bryan