some fixes and added messages