Update DB and minor changes