guilt: update with minor fixes

Signed-off-by: Jimmy Tang <jcftang@gmail.com>
Merge pull request #573 from jcftang/update-guilt

Update guilt