Fixed compiler setup and reviewed r/1996