minor performance improvements; GUI changes