assingment 4 final

couple more quick bug fixes plus directory changes