minor cleanups and gui functional test tweaks