minor changes, somethings fucked up