compile errors fixed
merging 2 last commits