updates to finish the registration and some polishing