closes #140 and incorporating points 1 and 2 from Lauren.