minor fix
fix makelenses
minor improve
minor changes