added a new file, cleaned up some other ones