Merged changes from rj into main, and added discussion.