WIP
Various improvements.