Fixed general bugs
Fixed general bugs