add more type; adjust spacing