small edits, added some work on new GUI windows