Initial commit
Fixed some bugs