Added Daisycon + minor changes