Final fixes v1.0