minor changes during bugchecking
major router overhaul ...in progress