some cleaning up and documentation update