Misc Item Changes Pt.1

commit separately to not override Andrew's changes