Updated certain options
Fixed missing 0 issues