fixed some registers, made Makefile nicer to work with