few changes reverted/tested
completed all, need to reformat notes