more changes, BuildTaskMC almost done