improved partial and fill tokens
1.9.0