Fixes issues #13, #14, #15 + some clean-up & demo report facelift