- Fixed makefile to use more standard construction
- Fixed a few typos/indents