different bugs fixed