bug fixes, more verbosing