Adding a few finishing touches before v1.0