Minor changes in .h, first .c !