Adding missed files and some clean up