more fun fixes