Correcting file names and other bugs

this branch branched off of jeremy and ricky's code that implements preemption.
should merge that one first then this one i think :)