Bug fixes, added messages