Updated descriptor model, plus various other tweaks