Lots of updates/bug fixes including new plot window