More updates and functionality