Updates per @sokra notes. Thanks!