Corrected so many bugs