- added `Includes` to component definitions and fixed minor bugs