Reorganized Items and Updated with sdj64's edits