Another bunch of changes that simply I don't remember, but well, they aren't working fully...