Features - Various Risk Improvements (due for 1st of may)