Bugfixes and detail-fixes