upgraded to support 0.4.0 CALVIN release, adds in some more config to run better out of the box