ugh more fixes