fixed some stuff?