again bugs fixed