A big set of Fixes

Will need a little help