Fix #1 and improve links