Fixed most of Tanya's suggestions.