-Fixed general bugs