added a couple of options. also removed unused files.