Initial commit
Added and Fixed some bugs