- Various small improvements: no bug fixes though but I moved a few things
  around.