Minor fixes
Many improvements over previous version... (too late to describe)