Updated fex things, simplified others, ...