Fixed registration
Final little things