Outline improvements
fixes #439