Time stats added & compilation improved