added plans, added a few missing values