Implementation of item only mode

and some little fixes.