fixes

allow user to bypass question and code clean up