more work on templates, icons, methods, parameters and return types