Fixed up arguments and docs for a few functions