added usage warning + fixed a bunch of crap