updated to include postgres and sqlite fixes.