bug fixes and some more functionality
Merge pull request #1 from vikasuy/hw2_work

bug fixes and some more functionality