Capable ot build make system and bug fixes