code fixes done
Merge branch 'oper' into staging
some errors after merging fixed