whitespace fixes, another attempt to add -O2 as regular make flag