checked off a few more todos I missed