Replaced some tabs and tweaked previous fix code