Updates to merge with barts files

- repositioning scale variabels to draw methods
- multiple minor adjustments