Added includes; nicer lists