little changes
Quick fix. Stupid logic ...
Merge branch 'relation_id' into test
Minor cosmetic updates