Minor changes
Correct relations on tables