Cleaned up submodules. Replaced autoclose with delimitmate.