support list and little tweaks