Fixed spanner, and correct token word in onto loader