fix usage + add headers