bugfixes in turorial03/06/07