gobs of cleanup
compilation fixes