Bug Fix and balancing attempt
Merge branch 'master' of https://github.com/tvbarthel/ChaseWhisplyProject