Some more improvements after Mark's feedback #5