A bit more EDP work and misc stuff