Almost done?

Something wrong in the updating of h/hu i think