enable 'related' field, fix typos
bug fixes and adjustments