Adding comments and autorun