mooostly done with registering

Only missing a small bugfix