proper docs and other tweaks