Fixed bugs. Whoops.