protocol improvements (untested)