completed many-to-one specs for now, more fixes