various small changes and improvements