Various improvements and ideas.