TRUNK-3258

made some changes plus additions addressing the previous comments on my previous commit