progress and a fix