Added abbreviation replacement and substitute command; Code cleanup