Minor Bugfixes and updated Art. Solves #1