added relation helper, improved others