fix bugs and etc..