fixed somethings..