editing defaults for consistency#88

michael-petersen merged 2 commits intoEXP-code:mainEXP-code/EXP:mainfrom

CarrieFilion:mainCarrieFilion/EXP:mainCopy head branch name to clipboard