bug fixes and msgs