Laura's suggestions

I'm not going to merge this right away. We can talk if you want me to merge it and then you play around, if you want to discuss the functions first.