final(kindof) changes to the planning code