fixed more dumb stuff