allow different filenames
handle different filenames,added test for "viewer"
add crude viewer