Add missing files and tidy up