added the other types

will correct data later