fixed some comments, added user-facing warning to startup #1087