changed loads of stuff
fixed error in registrations