Updated config defaults to more appropriate values