fixed all kinds of dumb errors