Formatting changes, removed delimitMate, added command t
Fixing stuffs
Merge