Various improvements. Nearing release 1.0.0.