cleanups and improvements, started with disambiguation
added disambiguation main source