fixed up stuff I couldn't test before