more boosters and some fixes