fixed issues outlined in this doc https://docs.google.com/a/g.harvard.edu/document/d/1-2D8Z-YeLeYLzSlYRIm-54YSWcZzg4A3VDFJ3Ifqzv4/edit