Modified some files to match documentation