1. Update TODO list with bugs and improvement
2. Fix bug: put not working