added expandos
few minor fixes