more update and bug fixes