more housecleaning and a bit more weak documentation