Fixed two answers per Sol's suggestions.