fixes, prepare for refractor

fix a small thing (auto ping issue) and prepare for major overhaul!