Updated info
Fixed some bugs