Fix database transaction rece

Conflicts:
	Callback.ur
Update the Makefiles
Update .gitignore
Better name for the rerun function