new figures for normal/special and minor fixes