Updated spellings and toString() implemenation