Fixed registration, translation clean-up and fixed various other things