small fixes, reformulations