Optical characteristics of InAs quantum dots capped with short period GaAs/InAs superlattices and InGaAs combination layers