Removed country from user registration
minor fixes
merged changes