Now defaults and fixed some indentation