began fixing many bugs