fixed minor issues with stuff