Optimizations, tweaked ponds; still buggy though