Fromat adjusted & other fixes. v1.0