Feedback and TODO

After prototype (exe) review