Cleaned things up, added missing