Lot's of stuff with a whole lot of bugs! Your'e welcome!
Merge origin/master