fixed a few more biz logic bugs
Working through use cases, fixing one at a time