Added --notebook option
re-org notebook command
re-org status command plus some bugfixes