More updates; see README