cleanup/fixing up of a few gui-related issues