final updates for v2.0.4