Made changes to debug and timer classes