Lots of bug fixes etc in this

Probably some awful misses by me ;-)

Enjoy

Karl