f-tons of addtions fixes and changes
more changes etc etc so forth