updated a LOT of files...
refactored up to 49, still need to do 37,39