Fixes to waggle and docs