added 9 more items and fixed some poor coding