Removed planning.
Some fixes.