Final comments, general cleanup