Updated

Bugfixes included.