H3: 3.2 Everything works well now
HW3: 3.2 Minor fixes for consistancy