copyright header updated + some error messages tweaked