fixed somethings...