Ver 2.0 of assignment 2

Bug fixes.