improved placeholders
form mostly works
Merge branch 'master' of https://github.com/wlabranche/quick
removed old things