fixed some option.model specific stuff