fix for loop and small bugs
Merge branch 'master' of github.com:WillForan/SlotTask