fixed somethings