Address remaining code review comments and update/fix documentation