Fixtype name and option

some edits from previous merge