indent, bugs & ...includes