Some minor bugs removed in registration