Fixes to new protocol, better output