fix the terminologies, add more content