some updates (working on sample-viewer)