Cleaned up the loading code and solved some issues.
Merge branch 'master' of https://github.com/IzaacJ/WinPhanDevs.git