Added better defaults