some testing, one bugfix