Fixed defaults
This gets uglier by the minute
Refixed my overlooked mistake