Various improvements. (version 1.0.3)