minor improvements + demo options