gui cleanup, more code comments, more consistent queue behaviour