Commit DB insert punishment code and some other tiny things