Added some missing content and a little more cleanup