@thelxinoe - thanks for these changes - have you checked these against what feat does?