Added more command and flag defaults