various small fixes/updates