fixed issue 16 - various fixes to alias resolution at various parts