Committing some updates from @bill