Various updates to the final registration module