Fixed sublime errors and a few stylistic things