final comments and cleanup