fixes some errors I made while merging