fixed stupid issues