important bugs fixed