More updates to multiline and simpledonut