Major Improvements

Computer crashed last week so this is building on after that.