1. Various small changes to silberman