Minor cleanup for issue #282, updated interactive demo