fixed up the investor side
Merge branch 'capright' into testing