More updates, and minor bug fixes