More todos
Add TODOs and pull fix from deluxe version