Cleaned up store a little bit and did some balancing