ok, let's commit. Adding comments has a lot of templates and code changes. But some style is need yet!