Many Random Fixes and Changes