fixing some stuff up