More updates

Hopefully should fix any problems caused by the last commit
more updates
Merge branch 'master' of https://github.com/lawsda/EmergingTech