various touch ups on GUI and code