shift and scale shape introduced. one additional layer to descriptor. bug fixes.