fix most before presentation
Merge branch 'master' of https://github.com/chenww05/ftc
update feedback from Thomas and Rafael