Updates from Weston's repo.