fixed bugs, cleaned up testing, YAY
Merge branch 'master' of https://github.com/mks65-dw/tunez