lots 'o small fixes