fixed some stuff up