Started work towards fixing 'if clafer has same name as a top level abstract clafer it is an instance of it'
small adjustments for corner cases