nits and small fixes