Cleaning up and debugging code, come CI fields added, some defines for C
fields added

Signed-off-by: Bleska <blecha.jiri@gmail.com>