Format and add some types
Format and add some types

tscholl2/smc,DrXyzzy/smc,tscholl2/smc,tscholl2/smc,sagemathinc/smc,DrXyzzy/smc,sagemathinc/smc,tscholl2/smc,tscholl2/smc,DrXyzzy/smc,sagemathinc/smc,sagemathinc/smc,DrXyzzy/smc