some rearranging and added 2 sublime commands