Improved the vectorizer

Added system_type as well. It's not crashing, but yields wrong results.
To be fixed.