more fixes

going to get this right at some point