Add comments and todo tags