Alex's fixes except for saving essay