fixed stuff up