sweeping up
More documentation and comments