included changed files

added more from the issues..hope this works!