Various assignment model tweaks

Closes #39