Fixed some bugs in Sai Praveen's last commit
Added many files