Registration Bugs

Fixed all registration bugs