Minor changes

minor commit, change in some metrics and other minor issues fixed