return button fixed.  Duplicate info window definitions fixed
working version
merged
hopefully fixed parseUpgrade crashes
Merge remote-tracking branch 'benjis2/master'