Minor changes + some new material.