Demo "Bottle of Aqua"; bugfixing