sort out some files
various updates
various fixes...
update viewer
fix merge