Work on getting registration done, plus some fixes to error handling.