Adding comments and small debug