some fix for performance
bug fix
bug fix
minor changes