add code for more uniform figures, etc.
use new scap and fig macros
fixed conflicts