Streamlining

Ok, as discussed here are the uncontrovercial changes that you already OK'd. I ran it a couple times and it's looking good here. Please merge ;-)

Gonna submit the other stuff as proper feature branches now, for better itemized discussions!