small bugs fixed
Merge