Moved tool loading to MDMTools.java, minor changes