Fixing the mess I got myself into. GUI features look to match the pre-tool conversion now.