Added debug system, comment updates