clean-up plus some docs