- Some small but not important bugs, see also "TODO"
