register definitions updated and cleaned up