Merge Changes

Little conflicts were resolved, nothing large changed.