minor bug fixes and change of plan data