more notes and registration code
merge
small fix