Changed some defaults per Josh and Excel sheet

Made control defaults match documentation