no more changing investor_from as it makes no sense #858
exercise fix on the options page
cleanup on the option pageshould handle edges better
Merge branch 'master' into testing