making things flatter, starting on #86
fixes #86