Bad Golf: Stability and bug fixes

Stability and bug fixes