Master commit 3 from TJ fork

please can you merge these into team's repo