Add links to the starter package
Fix bug