fixed stupid borken stuff