Encoding and other fixes
Forgotten file
Forgotten images