Tweak closer, add missing files