committing changes as per some bug fixes