fixing some bugs and adding more content