modified some apparent mistakes Sakai