fixed stupid stuff