Add bug fixes and little updates to agreement save.