Include example, small improvements