Minor errata, need to do major work to modernize