Revise directory content
Fix calculation bugs and add switch conditionals
Merge branch 'master' of https://github.com/Sachaniman/SoloQueue