Many updates - registration now works