Couple updates

added some default val's, and some var's to catch user input rather than
call default input