Updates per findings by viglesias

Vic found a few bugs and I fixed them here.