fix include bug; add analysis tools