Changes

My changes from the past couple days.