fixing some stuff up...