more fixes bitches