Changes made during pre-tests at IPA

Hi guys, I'm sorry for this late pull request. Here are all the changes we did at IPA last time...