Added more registers, defined OPs, cleaned some code