comment corrected
refactoring
foreign key shortcut join improved
tests added