Added a few more handles for tuning and fixed crashes