Fixes and Improved Stash Viewer

Many fixes, retrofitting is much more likely to succeed now.