more fixes

random stuff