fixed bug in registration (more testing needed); fixed other minor bugs