bug fixes and add more content