Lots of tweaking

..and some additions, aswell.