Fixed Everything that happened in the last 10 minutes