Registration
Allow comparison to null
Lots of fixes + saving