fixing somethings...