lot's of small changes and fixes.