A bit of clean up and adding in some missing files.