fixing stuff I broke last time