patched up some bugs
Merge branch 'master' of github.com:rzhou186/tunetheair