fixing stuff?