so many bugs fixed