Tweaked a few things going to stop because clearly you are making changes and I don't want to screw anything up while you are working on it
Tweaked a few things I am going to stop so I don't break anything you seem to be making frequent changes
Merging
More merging