Took out glaringly unnecessary parts of calculations.
Fixed some things
Merge branch 'master' of https://github.com/soolaimon/puzzles