bugfix: clean up was a mess up
first draft for documentation