minor project conveniences
add a token passing test
update from master