Fixed spell and improved