Various improvements, mostly in functionality.