Minor corrections from what Kioko and squall found