:neckbeard: fixed some bugs