Assignment #3

Looked assignment 3 throug again and fixed minor bugs