added some useful items
Resolved Richard and Josh's merge conflicts