fixed status

and some other bugs