Made log more verbose; bug fixes