tests
merged execution code, some fixes and comments