working on debug and comments