code review
code review
small fixes