fixing stuff around