fixed some bs with glitterfun