fix stuff up