Misc cleanup, docs, optional params