fix compilation, fill some holes
first functional