fix formatting problems
sync to repo with vipuls improvements