more bugs fixedwq