Rafael's Changes

Changes I made in the past week.