Some rewrites, a couple bugfix, remove the dependency on fiveAM, and more robust loading/reloading