fixing stuff still