Project 1

Added things to fix issue #4, 5, 7, 8. and 10. Started to work on issue #6