resolved some database issues