fixed and added a great deal of goodies