big fixes and updates to registration