Bug fixes and additional features for planning