Removed all of thomas' files from the Program directory and made some minor changes