Client feedback changes

Signed-off-by: Ben Bailey <ben@happycontent.com.au>