Fixed typo
lots of changes to tidy registration