Final 1.0.0 tweaks