Reverting part of last commit and fixing a thing

At the end of the day, it looks like FRESH shouldn't really be there...
(?)
I also forgot about something I did for debug reasons...