more merges, renames and corrections
cleanup/notes