Add some new modules and fix setting probs