Various Changes as per pull request comments