finishing up some changes/testing before submit.