moar brainfarts fixed