EthanR: fixed a few things