A few enhancements, links