added fixes
rework