db and style fixes