minor bug corrections
Merge branch 'alpha4'
fixed new step bug
Merge branch 'alpha4'