Various improvements, work on progress.