Hw3 Updated

- HW3 Updated
- Minor bug-fixes.