Fixed minor commit merge derps, fixed NBT, added trolley item rendering.