fixed some more bugs, 6 more left, not sure about those