we can choose what to prefill
cleanup and minor bugs
spaces before comment are back
Merge pull request #242 from electrolinux/smart-prefill

Smart prefill (+bonus)