#55 cleanups and more work on #56 including upgrading to jargon 4.0.2-snapshot