Continued debugging towards a first complete version