easier to set up, fixed various issues
-- Git-author: Jocelyn Fiat <jfiat@...> -- Git-id: fd6580e2ba9f670a7b9553e8feb02ba37958d3f0
Authored by: jocelyn_fiat 1970-01-01
Parent: [r2]
Child: [r4]
