minor conflicting issues fixed.