Fixed many bugs
Fixed many bugs