Better filenames
Changed variable names
Added Control-C trap