solved more bugs