+ added ccg support
+ some improved formatting for EC form