Addressed bjorns review issues