A few last-minute bug fixes, error checks and GUI tweaks.