some else fixes