So many bugs fixed