monor fixes
more variables
new samples