fix include structure
some description cleanup