Fix conversion unit issue, modify a bit about activity