Lots of bug fixes, mostly with many-to-many cross tables.