general stuff fixes