I think I have addressed all your comments in the attached patch.

Regards,
Bjarte