Fixed several bugs, mostly with cross tables.