Multiple fixes for the ORM with some LinkTable addition and as well as various little fixes here and there