Added killswitch and limit tuning