db fix
more fomratting changes