fix minor bugs in s and off by 1 in h
Merge branch 'master' of github.com:josiahseaman/skittle