small fixes/cleanup