content update and bug fixes