code review and bug fixing