more cleanup-y
+ [LOG-69] argument number message replacement
+ Documentation stubs