added david.  and some other tweaks