Bug-Fixes and Speedups