Fixed and cleaned up register activity