Fixed up the build file. Better commenting. More modular. Added dummy targets