registration finished and some minor changes