New model + rendering fixes