small changes and improvements