various fixes1
Merge branch 'master' of https://github.com/l-trap/l-trap.github.io