changed file names and paths
half fixed bug with options not working