some small changes and improvements