Lots of figures improvement;
also added beginning support for MIIPS-S