Registration Working Better

Mostly a fix to registration and some other small additions.