Fix some spacing issues
Address a FIXME in set_registers