Source code fix

Source code is fully fixes from the last commits errors and problems ,
sorry about that