fix bugs
Merge branch 'pickled-kb' of github.com:jdhenke/uap into pickled-kb