fixes jessica's issues 1 -4 from email of 4/7