documentation and some clean-up