adding my changes to core and small changes to registration
resolving merge conflicts in registraion and core