Some changes and improvements