Many small changes and corrections
Added stuff to do at end