changed things around, fixed tyops