Testing to master

Testing by tann and rootcoma proved no significant errors or bugs.