hw1 final
more changes
final hw1