Updates to 4x assets and some bug fixes