more fixing stuff