Plenty of tweaking

Several less and more important changes.