More fixes and ideas.