cleanup, fix db strings