Add github link
Add todo
Clarify error handling and lose some parentheses