Fix some small bugs. And prepere it to develop.