More updates for #62

There is still the undefined index error...