add scratch files, and some fixed