#82 minor changes
#87 if you're the only window then use the saved origin and save when closing the window