anyway, I think your 1) is a good idea, 2) and 3) maybe good ideas but should probably be done as part a holistic redesign of the entire system