some small improvements & updated awk command