Added Multi-Figure, Corrected few gliteches