Changed dispersion to fixed and added some TODOs