Fixing registration, smaller changes