small fixes and add comment with pending work