Cleaned up directories, added yet more debugging.