Some updates and improvements