Another bugfix and slow progress