Fixed some bugs and added some contents