cleanup notes, fixes from merge with master, + fix css error.