[Viking] Fix some bugs + start with retexturing