fixing stuff up