whitespace sanity & linux syntax style
cleanup & int to long fixes