Add fromJust and tweak stuff