More work on spec updates, and some console.log cleanup.