okay, fixed some stuff up