Link fixes and syntax