16 registers and other bugs