fixed 3 issues/enhancements