Better filtering, refactor of cron generation.. lots!