bug fixes -- registration process to be refactored