few wee twiddles from listtroid, after rebasing