Add minor logic tweaks and GUI startup