reviewed bugfixes
solved it
bugfixes and DataPreparer class
merged