Final cosmetic changes, error messages, and README