More debugging options added