fixed up some unintended moves from last commit and upped revision