more fixes duh