fixed some bugs, added some oscar stuff