Some fixes
Synchronized with work comp
Comented some functional for quick startup