Cleaned up debugging code
Update filenames etc