updates, finished with basic experiments
merged