multi type, refresh, fixes, improvements