renamed a file and some minor changes