added quite a bit of sanity
spacing cleanup