Dev up

And here it is another bunch of changed from the master branch! YAY!