Lots of bug fixes
updated fsplanning version