Various improvements and preparations.