Update Registration for E-14 and fixes minor bugs