bug fixes
code improvement