Couple cmake things
Bunch of cleanup... some really dusty stuff in there.