Fixed many of Lauren's requests