Upgraded to st-2.0.0-M3 + some minor corrections