Progress on #4, other minor details