bugs fixed
commit