EthanR: a few stylistic fixes/bugfixes