Db changes, code reformatted.