Some balancing stuffs for cats
Fixing merge conflicts
Fix merge
Fixed bugs
Merge pull request #69 from sli-fox/steph_branch

Steph branch