Fixed double stuff, runtime errors...