version 2.0 finishing touches