Polishing

Fix a few comments, error messages; docs.