Bug Commit

More bug fixes and balancing