ticket#6 - fixes by feedback