Fixed hw3-1
hw3-2
All stuff done