bugs fixed
merge