small fixes + beautifying lists