fix: comment added
fix: some better import of values