more bugfixes and conversion to bindValue