solved more issues