change

improvements,
added error messages and other stuff