More updates and improvements