More items that work better.

More items (that work better), changed some variable names.