Fixed bugs in the model descriptions, and updated the piccard-demo