Various fixes from testing. 1.7.10-1.0.0B1
Merge branch 'master' of https://github.com/Ipsis/BuildersGuides