documentation, cleanup, etc