Updated error messages; concurrency tweaks