more refactor mangled fixes
some dynmap integration cleanup