added Pocket.class
smaller improvements