Changed how some options work
Moved some options to the agreement model; several small improvements