white-space cleanse, and added forin flags to a couple files that need to be looked at at a later date.