Small changes and improvements