fix some gross stuff