Checked and improved all up to timeunits (line 210)

I will continue tomorrow. I have changed some lines and added somemore