Fixing up some things. Using the Sublime api a little more appropriately.