Various improvements and added features.