Last fussing

Many issues