comments, documentation, package consolidation