fixed dumb stuff