AH-257 Sorted out the stupid constant buffer numbering.
AH-257 Small improvements.