fixed preprocessing
refactored lists to vectors
more changes as adaption to previous commit