fixes to use mysql db
merging changes