Did some register renaming, added TODOs, split makefile to two