yeah more fixes