Added missing minor features