Fixed some bugs
Added a file to commit