knock a little association work out, to get back into the saddle with this
Fix up error message for a couple of things though