Some fixes for problems found by Eastwood

Mostly doc strings in wrong place relative to arg vectors, and wrong
numbers of args to function calls.

Signed-off-by: Ambrose Bonnaire-Sergeant <abonnairesergeant@gmail.com>