forgotten files and minor changes