Mluedke's various commits

Various commits (please see diff).