Move tasks into core; add boot opts; better errors