Added more preferences. Corrected names. Small style changes.