Some more options and improved output linking.