Some new features and improvements