Added some todo
Added some synchronizations
Small changes