added fk constraints; tidied up model associations (a bit)