Improvements
Added debug settings