Removed duplicated math arms and models.  Various fixes and improvements.