improvements and cleanups
adios sublime 2, hellowww sublime 3